From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 18 Jul 2025 09:21:42 +0000 (+0100)
Subject: Merge branch 'deb/emacs/d/trixie/master' into deb/emacs/d/sid/master
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~21
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=8555563cd61bde2f23abda23dbea6d967acb5e14;p=emacs.git

Merge branch 'deb/emacs/d/trixie/master' into deb/emacs/d/sid/master
---

8555563cd61bde2f23abda23dbea6d967acb5e14
diff --cc debian/changelog
index 8ac59267ed0,5139e492c6b..95742725d98
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
- emacs (1:30.1+1-6~1.gbpa971e1) UNRELEASED; urgency=medium
++emacs (1:30.1+1-7~1.gbpa971e1) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @a971e1d025da05b8e8a8e8024a8354bc06159e3a **
 +
 +  * UNRELEASED
 +
 + -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 15 Jul 2025 15:31:55 +0100
 +
+ emacs (1:30.1+1-6) unstable; urgency=medium
+ 
+   * Add Breaks/Replaces/Provides for builtin packages in this release.
+     See #1103033.  Thanks to Xiyue Deng for the patch.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 18 Jul 2025 09:58:11 +0100
+ 
  emacs (1:30.1+1-5) unstable; urgency=medium
  
    * Disable emacs-module-tests.el (Closes: #1101598).